From 150b52e207b8592a56069e42c90d652bea953cfd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Jun 2006 01:14:57 +0000 Subject: [PATCH] Remove the right XID from the xid table. (#34327, Sampo Savolainen, Tim 2006-06-04 Matthias Clasen * gdk/x11/gdkfont-x11.c (_gdk_font_destroy): Remove the right XID from the xid table. (#34327, Sampo Savolainen, Tim Janik) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gdk/x11/gdkfont-x11.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab1a020025..a2e1455b10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-04 Matthias Clasen + + * gdk/x11/gdkfont-x11.c (_gdk_font_destroy): Remove the right + XID from the xid table. (#34327, Sampo Savolainen, Tim Janik) + 2006-06-04 Behdad Esfahbod * gtk/gtkprintoperationpreview.h: Add missing G_END_DECLS (#343838) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ab1a020025..a2e1455b10 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-06-04 Matthias Clasen + + * gdk/x11/gdkfont-x11.c (_gdk_font_destroy): Remove the right + XID from the xid table. (#34327, Sampo Savolainen, Tim Janik) + 2006-06-04 Behdad Esfahbod * gtk/gtkprintoperationpreview.h: Add missing G_END_DECLS (#343838) diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c index 4833283ab0..16d93e27f5 100644 --- a/gdk/x11/gdkfont-x11.c +++ b/gdk/x11/gdkfont-x11.c @@ -367,7 +367,7 @@ _gdk_font_destroy (GdkFont *font) switch (font->type) { case GDK_FONT_FONT: - _gdk_xid_table_remove (private->display, ((XFontStruct *) private->xfont)->fid); + _gdk_xid_table_remove (private->display, private->xid); XFreeFont (GDK_DISPLAY_XDISPLAY (private->display), (XFontStruct *) private->xfont); break; -- 2.30.2